Plumfix mergeable

It should actually work this time.