Fixes #49
resolve merge coflict