Committing before merge
Fixing merge error