Change git confict style to 3 way