Trying to merge without destroying everything