modified gitignore. added naive conflict resolution.