database calls by id
merge conflicts