resolved conflicts hw-2