Tension thaws over whale plan between lobstermen, feds