Testing merges with git pull