initalize repo with old files
resolved conflicts