Handle conflicts a little better