merging
fixing conflics