An unplanned merge when pulling from master.