Checking in after resolving the conflicts.