Show conflits on make update (bug #3191)