Forgot some merge conflicts notes
Forgot some merge conflicts notes

mukkoo/welaika-suspenders,welaika/welaika-suspenders,mukkoo/welaika-suspenders,mukkoo/welaika-suspenders,welaika/welaika-suspenders,welaika/welaika-suspenders