fixed issue with merge conflict headers... oops
Merge branch 'removing-merge-headers'
fixed toggle issue from previous merge
fixed a m
Merge branch 'testing'