updated readme merge test
addressed merge conflict in test
updated conflict with the gemspec file