Fixed texture errors
Fixed merge problems