Add merge ff-only alias