resolved conflcit
fixed E128
polishing