mark as complete
merge our working directory