not sure what is going on
attempting to resolve conflict
ugh