nothing's working, still debugging
trying to solve conflicts'