Fixed git pull conflicts