Compiled the final pdf version
Fixed merge conflict