update Mainactvitiy
resolve confrict