stage1 complete
conflict merged
gitignore update