new actionbar
solved conflicts