properly merged