trying to solve git props
committed ongoing work
conflicts