WIP
Fix merge
WIP
Fix merge
Removing IDE config
IDE config