Updating .gitignore.
Updating Resources.
Resolve conflict.