text formatting
problems merging