Javascript works on Actions
Fixed merge changes