search conflicts removed