removed pvc file
remove conflicts