merged and resolved conflicts, added modal for canvas