Fix reverts and ignored files