Fixed conflicts
Fixed conflicts

Signed-off-by: Charles Joly Beauparlant <Charles.Joly-Beauparlant@crchul.ulaval.ca>

git-svn-id: 0e74fab0541819aebbd00c9c52f40ffc39ec7fe1@108724 bc3139a8-67e5-0310-9ffc-ced21a209358

CharlesJB/metagene