Resolving merge conflicts
Resolving Merge conflicts
Merge branch 'master' of https://github.com/sla89/WWE.git
Resolving merge conflicts