fix: catching error with undefined val
fix: conflict and resolve issue with undefined when updating board

Conflicts:
	js/app.js
	js/bundle.js