Fixing a merge issue with the last commit.