conflict fixies

This commit is contained in:
Dahlular
2021-04-29 17:37:37 -06:00
parent ad59e6913f
commit d3867f491b
Binary file not shown.

Before

Width:  |  Height:  |  Size: 824 KiB

After

Width:  |  Height:  |  Size: 691 KiB