Cleaning up EOLs
Cleaning up dependencies
Fixed Merge issues