merge conflict on the horizon