fixed || problem
merged conflicts