started adding stuff for @Rest:SerializeMethod and @Rest:DeserializeMethod annotations
fixed conflicts