Clean up wrong merge