Merge with Note3