Added previous commit thing by Velibor? Not sure how these merging attempts work. DB file was also updated with new tables/columns to fit code changes