resolve merge conflicts that were missed in PR
Merge branch 'develop' of https://github.com/ALE-Team/ale-prototype into research-eventing

* 'develop' of https://github.com/ALE-Team/ale-prototype:
  resolve merge conflicts that were missed in PR