real edit from rebaseBranch2