Results of git pull
Fix conflicts