minor
resolving conflict
merging in master