fix resume link
fix merge conflicts