merge and solve conflicts