conflict resolved and deployed