Refactored and improved Logic on Conflicts