merge more or less ok