Conflicts removed