Splitting vim file and adding a few navigation commands
Resolve conflic