update final paper
fix conflict