added link to how to ask questions the smart way
rebuilded conflict in pdf