Resolved merge conflict in inter library loans