remove extraneous file
merge