Fix more conflicts
Clean code in board-8064 to fix some errors