Initialize project skeleton
Merge conflict