Create conflicted edits to make this branch non-mergeable