Attempting to merge with staging