styles changes, attributed text: underline option, sync changes/fixes
resolve conflicts