Resolve conflict test

Created by  GarettWithOneR  on January 11, 2021
HRFQVINEPB3ODNOUFKVWOQWBTACCCRUJ7T6FHCJRMO3UFORQMRKQC
Change contents