Merging code