Fixed conflicts
Fixed conflicts v2