Fix merge conflict and remove debugging stuff.