updated message for invalid server for merge changes