Fixing Stupid Conflicts

Stupid "Head" and "Origin" stuff popped up when merging because of
conflicts. Solved now