Fixed Weird GitHub Merge Errors