ENH: Merged and resolved conflicts