Fixing issue with merge