potentially conflicting merge