Fix conflict with gitv