document origin
fix merge conflict