Trying to tape everything together
More tape
Merge conflict