worked on api, database things changed
conflict res