add .gitignore rule: ignore data/*
fix script.r merge conflict