Fixing conflicts
Fixed merge conflict