I suspect you will need to rebase from master. It looks like you are reverting the most recent Playdoh changes.