Conflicts on application.xml throw an exception

When getting the two versions of a conflicted file, the project is gotten from the session. The method to get it recreates the project settings but as the settings are gotten from the application.xml file too, an exception is thrown. It happens because the file can not be parsed due to the characters introduced in the file to show the conflicts.