Fixed more merge conflicts... Flash compiles now