fixed obstacles
fixed confilcts