Revert "solved merge conflicts"

This reverts commit dd2c2cb15de3039a003b2115ea7813a555e00183.