Studio Fragment
resolved conflicts