[OE-4203] New eyedraw integration work
Removed git conflict files
Merge branch 'feature/doodle-panel-OED-4' into develop