Added colorzz
Fixed conflicts