starting freezebomb making
fixed conflicts