Branch 3 edit 7 for conflict
Branch 3 edit 8 after conflict
committing after resolve conflict