fix eps
fix conflicts