ENH: git conflict fixed