Fixed the merge conflicts that went undetected in github