fixed file casing
fixed lowlag merge conflict