resolved minor conflicts (project:path(), layout.css)