@nfoti hey sorry i should've mentioned these as well...

just in general, make sure you get the merge conflict markers out :smile: . in this case after this one you're done