modify merge-abh2mast.txt by guwb-ubuntu
modify merge 2
deal the conflict with merge-abh2mast.txt by guwb-ubuntu