change via fw before pulling change already pushed via plugin - what happens?
fixed merge