Updated composer.lock
Fixed conflicts.