enable ruby on-fly-syntax check
resolve conflicts