merit function added
merit function added (fix merge)