merge
simplifications