fixed, can't merge like 'origin/master'.