solved all my merging fails ;)