remove arch flags
merge
merge