Fixing conflicts for merge