remove properties that shouldn't be merged to this branch