Resolving conflict with default layout
Resolving conflicts

Conflicts:
	templates/layouts/default.jade