broke dependencies during merge