Fixed an issue with the conflicts being stored in the wrong directory.