Conflict/cg1

resolved it