Fixes
Resolved conflicts. We both did the same fix :P