include yml config
add gitignore
fix merge