Testing conflicts in pull request
Merge pull request #1 from javier-gp/master

#FD-122 Testing conflicts