merge manualy all things from develop