fixed errors in 3D after conflicts