Correcting changes made by the other guy