Initial commit.
fix conflict in gitignore