cleaning up conflict markers and removed the code that was to be discarded by the merge.