do something on branch
do something else on branch
resolve conflict b/w branch and master