Merging of code