transactions testing and creating
merging conflicts