Manuel merge