remove composer.lock
fix merge