added my stuff (which is working) and changed some tables, plz drop the database and try again
fixed weird merge stuff