mixed up two files