qtopia: merge