add master
remove confrict