Composer & composer.lock in GIT and merge conflicts Composer & composer.lock in GIT and merge conflicts laravel laravel