Fix merge and remove multi-creates