board logic
conflict fixed