Fix Conflits #2