merge, cleanup, resubmit