Pull request second try
Settling the conflict :)