Did you add? If not, could you try and remove it? (may be the source of merge conflict)