fixed width
fixed conflicts
Make master branch look like wip