conflict resolution again

last time?