merge error fix: employee texture mapping
merge error fix: accessory shadings