Conflict resolutions. Get scripts back to where I want them.