[#3] Merge conflict properly resolved.