You shouldn't be merging broken/exploratory stuff to master. Rebase or rewrite the commit so it's correct, self-contained, and others can understand it.

Agree!