Added merging of user adapter and history adapter