Resolve conflict
Remove .idea folder