How to repair a pull - AmiAmalia