minimal fix to versioning and syntax
add gitignore file
fix conflict