caitifbrito resolving conflict