Added modified merge tool to work with new Azeroth world.