Remove merge conflict bars