gitignore file
fixing merging problems
trying to fix merged conflict