Feature 2 edits on new branch without a merge