review pages for all done. updated homepage accordingly
conflict resolution