I messed up the merge a bit. I forgot to delete the contents of bin/, and the folder databasetools/