resolving some file differences