fixed merge from db fix patch