remove comments from multiple classes
resolve merge conflict Symeetry/ChatManager.m