make merge first complete
add git ignore