Merging...
Merging successful, effects bug fixed