new change from branch mybranch
merged both branches