Removing unused contrib directory
Fix bad merges