fixed conflict in activity