removed changes from unmerged code