links
fix style
solve conflicT