3d applications
resolved conflicts