I'm trying to use both Clever's Moveset and Map for Goblins, but both have the aformentioned file. How do I combine them?