fix big bug
merge unclebill
remove merging mark code