render after pull and fix conflict