sprint 0 task 5.9
resolving the conflict
fixing database
updated stock