fixed merge conflict issues further

ready for front end debugging/form validation