Fixed oops when merging`

Fixed merge comments from merging files