merging in original branch when submitting