video styling
fixing merge conflict