removed some issues after merge conflicts