Commiting to resolve conflicts.
Resolved gitmodule conflict