Forgotten conflict resolving after merge.