i have homefeature overridden, and got the similar "cannot redelcare" problem. after remove the module and override files i can update without any problems.
try:
1. restore to previous point
2. uninstall, remove the module from the admin page
3. save the module in override folder to you local, and remove it from the server
4. prevent db lock. close any connections to the db.
5. try upgrade again