change smerge-markers