Cong back on track as feud ends