Finishing up resolving conflicts