Missed Conflict

Resolved this conflict that I had missed