edit from branch issue2