merged my files