merge
solve conflict
add resume and coverletter