manual code merging