Worked on materials
Fixed merge conflict