init
init
add ignore and routes
resolve ignore conflict