GitHub repository: Kamalabot/new-branch
Description: this is for showing merge conflict in action