init commit
add conflict check