optimizing database
merge conflicts done