Removed conflict code.