bug fixing
fix conflicts