updates
fixed conficts