Code Editor : conflict.html