merging my patches to supervisor