resolved few conflicts when merging