Use fenced blocks
Fixed conflicts