Please read you diff before committing them. This i clearly a left over from a merge conflict.