my music content
fix conflicts