fix pushed conflict tags
fix wrong variable in exception
update permission key