ehm..resolving conflict?