fix merge
move the flag files to a different directory