change projects and eboard
fix conflicts