small changes
fix conflict
clear all compile errors