everything merged