slight refactoring
for merge from origin
for merge from origin