fixed some conficts