@naomiblack your 2 PRs have the 2 first commits in common (judging by the commit comment). I think you'd better want to drop those 2 first commits where they have not been updated (should be this PR then). 

Otherwise they will be merge conflicts...