partitaIva as Integer
Merge remote-tracking branch 'origin/developer1' into developer2

Conflicts:
	projectExample/src/main/java/model/Person.java
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.
resolve conflict