add writting by person2
resolved conflict