minor
add subjects
resolve conflict