use relative path
fix post-merge issues, update