Deleting everything to prevent merge problems.
Merge complete.