DevConflict - Day 2