transactional DB implementation task
fixed merge