Deleted conflict issues

Deleted conflict issues that I neglected to reconcile at last commit.