Resume Fix

Lol conflict.