add shallow flash gaia, gecko
chmod
fix conflict