Sergio's commit
resolver conflicts