As I wrote in https://www.openstreetmap.org/changeset/164269073, you shouldn't be using lollipop mapping when trying to place a feature like a bunker within another feature (like a fairway). See my previous notes for the wiki that describes the proper way to map these features. Please let me know that you've seen this comment. thanks.
