jobsite and customer action for job edit
deleted one file
conflicts removed