Created pdf
Created pdf
Fixed conflicts