sync log table to project
resolve conflict