About to remove shifts...
WIP - shifts gone
More fixes for merges/shifts