worked on ascension logic
merge conflict