Add macklemore to file
solve merge cnflicts