test merge

should have a fucked up platty somewhere