compiled
Merge resolution between Gupta's commits & main