i'm bad at git
remove git merge oops
use Lens'