crud app done
resolved conflict