Merging all code