fix typo in shingeki no kyojin common02
change scene in shingeki no kyojin op1
change op suite merge strategy