How to solve merge conflict on composer.lock file