Sentence 1: A new supervisor started at my workplace last week. 
 Sentence 3: A recent disagreement even escalated into a yelling match between us 
 Sentence 4:  I stepped back and realized I've been acting a little confrontational 
 Sentence 5:  I adjusted my behavior and now things are better with the new boss 
 Option 1: We've been getting along very well. 
 Option 2: We've been rubbing each other the wrong way from the start.