conflicts resolved on idea folder