Changed the name of the issuefragment to planning poker
Fixing conflicts