done standard part
fix conflit