git pull conflicts fixed2