merge cleanup: make sure to get fresh shared dir each time