fix directions
map bug fix
resolve conflicts