Unknown changes from mac mini
Finishes merge
merges both computers