StickORM Initial Push
.MERGE_HEAD removed