changes to paper
removed conflicts