add profiling opt to Db
resolve conflicts