.gitignore composer.lock modified
conflict resolved