COMPOSER.LOCK MERGE CONFLICT

bower.json syntax, c99.php download, bower.json to package.json, composer.lock gitignore, composer.lock conflicts, bower.json vs package.json, composer.lock example, bower.json resolution, bower.json format, composer.lock file,