Fixed an issue which caused conflict resolution to not work.