Where did I go wrong here
Not sure why you have this
<<<<<<< Original
<<<<<<< Original
but remove that from your manifest.xml
. It shouldn't be there and isn't proper syntax for xml so you are getting the error.
Is there a better way to delete project files without messing up the AndroidManifest.xml?
Not sure what you did to cause this but it usually shouldn't be a problem. You just delete the files you don't want and sometimes you might have to delete associated resource
files, Java files, etc... There is also the refactoring tool which is handy if you want to rename or move files.