please pull this and use git rm -r --cached .
merges should be less failure-prone now