Fixing syntax for merge#1