remove more merge artifacts

let's work on not leaving this stuff in