changed file in branch
fixed conflicts with someothernewbranch