Makefile output fix
conflict fix because of --amend