add back office and show view
fix conflicts