switch
merge
add ignore file