Conflict: Remove Conflict Immediately (Colerain)