fixing merge conflicsts
syncing up