merging code base