dding file 5
Testing vim command
Merge branch 'master' of https://github.com/omaralejandro89/my_cool_project

Conflicts:
	file1