my part except session
my part except session after resolving conflicts