resolve pull conflicts