clean gitignore
add comment
fix merge issue