Merge with Local +7