creating conlfict in master
creating conlfict in slave
conflicts resolved