add slime config
resolve conflicts