Merge code 2