improved latex paper
merge conflict