fixing merge issues
implementing Model interface on several Model classes