demon merge conflict