intellij 에서 commit (add작업 없이 바로 commit)
Merge branch 'master' into branch1

Conflicts:
	src/main/webapp/WEB-INF/views/form.jsp