Fixed issue with auto-merge.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>