Added loop theme
Fixed merge conflict