removing the ugly merge