database and little fixes
conflict fix