resolve-conflict

- Git merge conflicts occur