remove merge conflict changes
remove merge conflict changes

bernardhamann/generator-express-simple,ngenerio/generator-express-simple,darlanmendonca/generator-express-simple,bernardhamann/generator-express-simple,darlanmendonca/generator-express-simple,ngenerio/generator-express-simple