lighting model
merged project file conflict