more robust
merge origin/master