Merge conflict resolved
Preparing for removing .idea folder