test of branching, file edited while on testbranch