in branch master animals.java changed to animo.java and conflict created in the last method ...
animals.java changing to animo.java
conflict creation ...
conflict creation 2
Second commit resolved ...