Created conflict
Created conflict in master branch
Solved the conflict