Fixing merge conflict due to forgetting to merge the last pull req