Removed the coverage extension from phpspec.yml
Fixed merge conflict