Conflict marker snuck into the change log.