deleted .idea
resolved conflicts