Modified module c in local repo
This commit follows a merge resolving conflict in Module C