conflicts resolved
adding -1