fixed all alex conflicts. Compiles