manually merge with sandbox