fix editor position
fix conflict