merge

Updated paper