Merging back with latest version