Resolve merge conflicts and add multi-format image support 3c0c6f0 DynamicPacific commited on Jul 11, 2025