have done with details page
resolved conflict after pull from develop