#45 - Fix merge conflict handling

Pull Request Auto-Created by Zhenbot™