Resolved merge conflict in sub-module info file