Remove merge-conflict error displayed. Add ignore for compiled assets. Add vim gitignore options.