WTF is going on with my merge tool?!?!?!