added condition C files
dealing with conflicts