by test
merge with test
pull origin to master and deal conflict then push