Travis is silly, I need to compile test after manual conflict fixes :/