Forgot to remove one of the merge tags