implented basic save and get messages in dao
resolve conflicts