*NEW DATABASE DUMP* Fixed merge issues with database dump