correct merge marker so Travis can update it