Added resume
fixing conflicts