remove extraneous space and roll back version number change
merge conflict resolution