Fixed strong tag
Fixed conflicts