diamond bladez
fixed conflicts