Improved message in case of conflict