created first post
fix merge conflict in gitignore