more data and photos
resolve data conflict