changed subtitle
fix merged conflict