Nope, no conflict here, just two Gurmukhs/GurSikhs who have nothing but respect for one another.
This picture to me is a reminder of how there are people now a days who are trying to change Sikh history and are creating issues in hopes to split the Khalsa Panth into sects. Let this be a reminder to all the youth who who are introduced to Sikhi via a person along with their personal beliefs. Sikhi isn't about which rehit you follow or what jatha you belong to, but what speaks to your soul and what helps you elevate yourself closer to the Guru.
Learn to live and let live and avoid stereotyping someone based on jatha. A lot of hate being seen as of late and this picture really made me happy.