Address merge conflicts