And recommitting my changes
Fixing merge conflict