small updates/
fix conflicts.