adding int z
solving scenario 1 conflict