My Items page completed
resolved conflict and finished My Items page