fixed test merge errors