added submit button
fixed merge conflict