Fixing merge error