add conflict mode
add master