Change to base & fix duplicate flag - ZH

#4

Change to base & fix duplicate flag

Ready to merge
This branch is ready to get merged automatically.

Sign up or log in to comment