board started
fixing merge conflicts