Clean up an merge

My terminal is playing tricks on me.