non_fastMerge dev
merge with on-ff
fix issue-001
merge bug fix 001
add gitignore file