conflicts and debug remove