Re-adding missing files from the last merge attempt