resolved the conficts