everything merged, and working