merge with staging