fixed merge issue (for good hopefully)