Merger bugfixing