Work progress at home
Working at work
Solves some merge problems