Remove dev config
Handle file name collisions when merging content
Fix typos in MergeService