add develop sentence
 add master sentense
remove confrict
remove confrict caused by pull