Spring cleaning
Fixing merge conflict
Fixed conflicting errno