fix board merge