====== merge ======

====== merge conflicts ======

<code bash>
git checkout --ours PATH/FILE
git checkout --theirs PATH/FILE
</code>