fix dependencies when merged