Added removeNoMoreConflict