should find a better merge tool... :/