Creating new pyramid project
Resolving merge?