Fix transition merge