update interface
fix conflict