resolve conflict some on 3d extension branch