commit to pull
merge with master
try merge again
merging with master
merging with master
merging with master