Fixed an issue where resolving the conflict could lead to a loop