removed idea file
resolve merge, ide file.