Some changes at location 2
Conficlts solved