add high level files
resolve merge conflict