fixed conflict in MainActivity