Fix conflicts
Modified Grid For Entity Detail.