fix conficts