removed redundant extensions folder
Fixed merge conflicts