fixed merge conflict in header

magic!