makeup flags
after merge