Replaced ACE with the Editor Lite for resolving the merge conflicts
Attach a file by drag & drop or click to upload
