init commit
resolved conflict
commit to feature branch
merged