Conficts resolved?