.gitignore added
conflict fixed