refresh and fix conflict syntax