Working on stages
Added editing stages in search list
Merged
fixing conflicts
fixing conflicts