@peterfpeterson can't do a conflict merge correctly.