Conflict between two similar files.

Conflicts with the two files. Deleted the extra.