Local cleanup fixes
fixed conclicts