fixed, amended, force pushed