deleting sprockets
fixing conflicts