Iron out merge conflicts