mege
fix conflit and fix flip