Truce reached between Akhilesh, Shivpal; Shivpal to get back portfolios, Gayatri to re-enter U.P cabinet