resubmit conflicted project