PeterBooker resolve merge conflict
Latest commit c165334 Oct 13, 2018