add anna and flavia last changes
resolve conflict