fix git's awful automatic merge

i hate git!