Fixed color merging conflicts!