started on conditional get
fixed merging conflict