fixing merge
fixing property in validation set