With conflicts removed