Fixed broken areas after merge