merging changes to board