I realized that I created the feature-homepage_feature-ad branch off of the now-obsolete "leaderboard" branch, which is why there were so many conflicts. I created this new branch from 2.0 and cherry-picked the last commit to the feature-homepage_featured ad branch. I think it's now ready to be merged into 2.0
I realized that I created the feature-homepage_feature-ad branch off of the now-obsolete "leaderboard" branch, which is why there were so many conflicts. I created this new branch from 2.0 and cherry-picked the last commit to the feature-homepage_featured ad branch. I think it's now ready to be merged into 2.0