Added something
Added the int property
Resolved the conflict