*.brd binary merge=useTheirs *.sch binary merge=useTheirs