Add Jeff to the panel
resolve merge conflict"