Fix merge for inputMove