fix merge conflict
fix merge conflict

saizai/MakeYourLaws,MakeYourLaws/MakeYourLaws,MakeYourLaws/MakeYourLaws,saizai/MakeYourLaws,MakeYourLaws/MakeYourLaws,saizai/MakeYourLaws,MakeYourLaws/MakeYourLaws,saizai/MakeYourLaws