This is a sample commit that will be pushed with a tag
Fixed a merge problem