merge from develop resolved