Complete mess in merging and git stuff
Bugfixes
Added actual asserts for merge integration tests