init public repo
solve merge conflict