Conflict resolved, server rebuilt