Bang))
Fixed conflicts