Fixed a git error where things were not propperly merged.