Almost working right
fix merge conflict