context action bar buttons fixed
resolve conflict