Resolving Conflict termsNavierStrokes.c