update local, upload bugged training page
delete conflict