committing to merge with dev