I think you resolved conflicts with wrong side.