Update before going home, I need to fix Merge