yes
because of gitMerge branch 'master' of https://github.com/rswang/piplup

Conflicts:
	login/app/server/router.js
	login/app/server/views/index.jade