Added comment drawing
Added changes for conflict