undoing some changes after merging