this should be the correct merge (famous last words)