Removing marks from resume
fixing merge