Added golint
Removed conflict
Deleted undofile