Replacing file changed by mistake with version from master