Added namcap task. Fixed conflict resolution.