Merged conflicts to fix title bar