I guess I forgot to commit this before
Fixed merge conflict