trouble with zbuffer
merge conflict with makefile