fix eps
fix conflict