Fix merge issues - bad list in resources pane