asteptam erori
conflicts resolved