canvas image
solve conflicts