Fix conflicting change log in DB