#23 merge and fix nullable resource