reconcilled merge