Added template for cerrarProperty
Fixed merge conflicts.