files renamed to lower case
resolved conflicts