created new input branch. test merge with input —> trunk revealed some things I didn't like (it should've worked however..)