cleaned up master

cleaned up some files from previous conflicts