Remove Werror temporarily, remove merge fail git line