cleanup demo conflict markers

cleaned up conflict markers and removed the code that was to be discarded