Automation
.
resolve merge conflict