Add commit with conflicts. Mock bug fix on feature.

Testing 123