[fixed] file reversion from merge