@thyms resolved conflicts.