solve conflict2
solve conflict2
final page profile android
profile 2 android