Fixed broken merge conflicts