got move to work, conflict not working