Fixed untracked and clear entry block
Fixed conflicts