Fixed broken merge problems