Properly fixing conflict (forgot to save before)