removed conflict marking
some preliminary search page test stuff