all conflicts removed