Fixed merge conflicts 

All changes are now in one branch but there are no conflicts :)