Merged conlfict