Added conflicts prepare.sh
Revert "Added conflicts prepare.sh"

This reverts commit b53ec9693f3e539c4eac907d826b1b05c5ea1ff9.