message for a conflict from latest develop