MEETSAM: Remove merge conflict text