Fixed bugs
Fixed conflicts