Merge conflict fixed

Man, that was such a loss of time.