fixing conficts