some stuff broken, but texture comparision
merge conflict resolution