clampdet/none complete
merged conflicts in clampdet/solver but it doesnt match the solver in conv1