Added waste create code as merge conflict

In the case that two liquids merge safely with no result it will create
waste liquid. To prevent this a mod should register a merge result
allowing for more complex or better liquid merging.