detect slave status change
conflict commit
Merge origin/master