conflict ready
add git ignore