6aad8f1 Remove files from merge