resolved merge conflicts: resource handling