initial serial test
.gitignore
fixed merge conflict