3,madigan6: fixed conflict error from joel's merge