syntax probs fix
merge