removed extra submit button lying around
merge conflicts
merge conflicts in header