Conflict resolved with actionbar.
Conflict resolved (again) with actionbar