Conflicts: main.go models.go templates/index.html Saw that some previous modifications were lost due to the previous merge :)