edit after branching