Checking in after resolving conflits