Freaky merge - lost data