Corrected error for merge conflict