removed extraneous files created during merge