show .swp files ;)
remove add_new_object (notes thing)
random changes
merge
merge