Feature/merge terrai