moved files from temporary position into proper app location
resolved conflict