Fixing merge commit