add split back in
remove extra file that was built in the wront place
bump version number
fix merge conflict in version file