Fix javasript error from merge conflict.