fix: validate uncles fixing conflict