finished 3rd
merged conflicts