fix merge conflict
input boxes added to surfaces, working on flip next