Massive merge conflict resolve due to mixed edits between documentation pr and logic pr
Another merge conflict caused by the previous problem. This conflict occured after stashed code was popped