Updating effectastic
conflict fix