Solve conflicts & merge pull 141