Fixed merge conflict issues