Revert "More conflicts.."

This reverts commit fb5da6796a32081c9264875da7ed31fb61ee3178.