Cleaning up mess created but merging two branches with different IntelliJ project configurations