idgaf
fixed conflicts
fixed fucking resume button