merging code