Remove the -arch removal
Merge branches