Created composer.json file
Fixed comflicts in composer.json