What do I do after I merge feature files with a remote server?
You will have to revert the feature, So that the configurations in the remote server would be same as that in the code. Feature overridden means, the config in the Code and that in the server is not the same. So by reverting the feature you make the code and the db config the same. Please be cautious while reverting the feature, Sometimes the changes which you have done directly in the server would be lost. It'd be best if you test reverting the feature in your staging environment first.