Merging code finish: version 1