+prjt file
+fixing conflicts