Remove Scaffold and Join Conflicts