trim out merge conflict text