scaffold project
resolve merge conflicts