build issue : Create slots for merge conflict resolution