Re-adding changes I made and overwrote with merge.