fixed odd merge conflict that got committed