pull conflicts solved