Had to change some wording
Fixed conflicts
Merged maroon to feature-1
Resolving some more conflicts