more conflicts removed