sigh.. conflict resolution.