Fixes some merge conflict.

Signed-off-by: crynobone <crynobone@gmail.com>