fixing relative path error after merge