Update to resolve conflicts due to renamed files