commenting locally
merging
removing .idea files