merging
adding link knockback (beta version)