fix comment width, merge conflict hanging around