fixed widths
merge conflict resolution