Punjab Chief Minister Charanjit Singh Channi and former state Congress chief Navjot Singh Sidhu have resolved their differences, sources said.