add feedback in database
resolved conflict in files